Remove unnecessary ifdef in defn of xprintk. Install

xenguest.h.
Signed-off-by: Joseph Cihula <joseph.cihula@intel.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index e0885bd83642cb71a7f6386078e103f3cdeb6292..fe18653ddeff22572375cfd30b5d13f8f1f32e0c 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -241,11 +241,7 @@ console_initcall(xen_console_init);
 #endif
 
 /*** Useful function for console debugging -- goes straight to Xen. ***/
-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
-asmlinkage int xprintk(const char *fmt, ...)
-#else
 asmlinkage int xprintk(const char *fmt, ...)
-#endif
 {
        va_list args;
        int printk_len;

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index c51e899c065325fe90164c94abcf752dd19e0774..2f6f58194233596223534d3815a89d489352922d 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -102,6 +102,7 @@ install: build
        $(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
        ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
+       $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
 
 .PHONY: TAGS clean rpm install all